projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 16ae28c 60022fa)
bitkeeper revision 1.1123 (4100e6bayo7vN1TCcMOno-0X4Q6suA)
authorcl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk>
Fri, 23 Jul 2004 10:21:46 +0000 (10:21 +0000)
committercl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk>
Fri, 23 Jul 2004 10:21:46 +0000 (10:21 +0000)
Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xeno.bk-ptrw

1  2 
xen/arch/x86/memory.c patch | diff1 | diff2 | blob | history
xen/common/schedule.c patch | diff1 | diff2 | blob | history
xen/include/xen/sched.h patch | diff1 | diff2 | blob | history

diff --cc xen/arch/x86/memory.c
Simple merge
diff --cc xen/common/schedule.c
Simple merge
diff --cc xen/include/xen/sched.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.